Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Wed, 17 Apr 2013 16:37:15 +0000 (19:37 +0300)
committerEli Zaretskii <eliz@gnu.org>
Wed, 17 Apr 2013 16:37:15 +0000 (19:37 +0300)
commitd4e2fcdeee584eea9495b17cabc7ee195adaa709
treed995b5c8a1eb42992d48015ee79f9827b4d73a25
parentb3d9508594f7c561ae21133bc26aa12a7261312c
parent44e870bfd3101f473beb1ff4a9508c909fa87902
Merge from trunk.